Reset style attributes even if the widget isn't realized.

Fri May 18 15:26:26 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktextview.c (gtk_text_view_style_set): Reset
	style attributes even if the widget isn't realized.

	* demos/gtk-demo/main.c: Use a slightly smaller font.

diff --git a/ChangeLog b/ChangeLog
index 1d3431be519f392540d6f0aedeec34018d59e4b6..334b994642939c09b94cd153b2e263a2c0e70abd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri May 18 15:26:26 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_style_set): Reset 
+       style attributes even if the widget isn't realized.
+
+       * demos/gtk-demo/main.c: Use a slightly smaller font.
+
 Fri May 18 14:25:20 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcontainer.c: Remove reallocate-redraws property.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1d3431be519f392540d6f0aedeec34018d59e4b6..334b994642939c09b94cd153b2e263a2c0e70abd 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Fri May 18 15:26:26 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_style_set): Reset 
+       style attributes even if the widget isn't realized.
+
+       * demos/gtk-demo/main.c: Use a slightly smaller font.
+
 Fri May 18 14:25:20 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcontainer.c: Remove reallocate-redraws property.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1d3431be519f392540d6f0aedeec34018d59e4b6..334b994642939c09b94cd153b2e263a2c0e70abd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Fri May 18 15:26:26 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_style_set): Reset 
+       style attributes even if the widget isn't realized.
+
+       * demos/gtk-demo/main.c: Use a slightly smaller font.
+
 Fri May 18 14:25:20 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcontainer.c: Remove reallocate-redraws property.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1d3431be519f392540d6f0aedeec34018d59e4b6..334b994642939c09b94cd153b2e263a2c0e70abd 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Fri May 18 15:26:26 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_style_set): Reset 
+       style attributes even if the widget isn't realized.
+
+       * demos/gtk-demo/main.c: Use a slightly smaller font.
+
 Fri May 18 14:25:20 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcontainer.c: Remove reallocate-redraws property.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1d3431be519f392540d6f0aedeec34018d59e4b6..334b994642939c09b94cd153b2e263a2c0e70abd 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Fri May 18 15:26:26 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_style_set): Reset 
+       style attributes even if the widget isn't realized.
+
+       * demos/gtk-demo/main.c: Use a slightly smaller font.
+
 Fri May 18 14:25:20 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcontainer.c: Remove reallocate-redraws property.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1d3431be519f392540d6f0aedeec34018d59e4b6..334b994642939c09b94cd153b2e263a2c0e70abd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Fri May 18 15:26:26 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_style_set): Reset 
+       style attributes even if the widget isn't realized.
+
+       * demos/gtk-demo/main.c: Use a slightly smaller font.
+
 Fri May 18 14:25:20 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcontainer.c: Remove reallocate-redraws property.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1d3431be519f392540d6f0aedeec34018d59e4b6..334b994642939c09b94cd153b2e263a2c0e70abd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Fri May 18 15:26:26 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_style_set): Reset 
+       style attributes even if the widget isn't realized.
+
+       * demos/gtk-demo/main.c: Use a slightly smaller font.
+
 Fri May 18 14:25:20 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcontainer.c: Remove reallocate-redraws property.

diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 69710e3ada7130fa3f6fe3a546e7bdd765fef138..d5d0238ddec71410c236e31ac24828832c692702 100644 (file)
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -646,7 +646,7 @@ create_text (GtkTextBuffer **buffer,
 
   if (is_source)
     {
-      font_desc = pango_font_description_from_string ("Courier 14");
+      font_desc = pango_font_description_from_string ("Courier 12");
       gtk_widget_modify_font (text_view, font_desc);
       pango_font_description_free (font_desc);
 

diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index b39f073487a3a90d5c26df5bc36d5f659f89d2e8..f9c405430f9cf083b0c88275eb18c9a8bc2f189b 100644 (file)
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -1019,6 +1019,14 @@ Get the type of GtkIdentifier.
 
 @Returns: GtkType -- the enumerated type of something.
 
+<!-- ##### FUNCTION gtk_image_menu_item_add_image ##### -->
+<para>
+
+</para>
+
+@image_menu_item: 
+@child: 
+
 <!-- ##### FUNCTION gtk_label_set_markup_with_accel ##### -->
 <para>
 

diff --git a/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml b/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml
index e8b5829f36e307df0d07afdcb98f734a160452a9..dd6a07fb32ba8100d7838acdd7be055e0267af9c 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml
@@ -27,15 +27,6 @@ GtkImageMenuItem
 </para>
 
 
-<!-- ##### FUNCTION gtk_image_menu_item_add_image ##### -->
-<para>
-
-</para>
-
-@image_menu_item: 
-@child: 
-
-
 <!-- ##### FUNCTION gtk_image_menu_item_get_image ##### -->
 <para>
 
@@ -58,9 +49,10 @@ GtkImageMenuItem
 
 </para>
 
+@Returns: 
+<!-- # Unused Parameters # -->
 @widget: 
 @label: 
-@Returns: 
 
 
 <!-- ##### FUNCTION gtk_image_menu_item_new_from_stock ##### -->

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 8bb7314b47c823bcde7ce3e9c32065f5f01ba137..bcbb5b58c19fbae1671aa18e2773769e8d701849 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -2792,7 +2792,10 @@ gtk_text_view_style_set (GtkWidget *widget,
       if (text_view->bottom_window)
         gdk_window_set_background (text_view->bottom_window->bin_window,
                                    &widget->style->bg[GTK_WIDGET_STATE (widget)]);
+    }
 
+  if (text_view->layout && previous_style)
+    {
       gtk_text_view_set_attributes_from_style (text_view,
                                                text_view->layout->default_style,
                                                widget->style);